From 9cbda7ce93003ee158282e9fa3f861252659e2c3 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sat, 7 Jan 2017 03:27:44 +0000 Subject: [PATCH] gcc_6.3 Gbp-Pq: Name gcc_6.3.diff --- src/corelib/tools/qalgorithms.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 4f704d676..f211e985c 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -626,7 +626,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) Q_DECL_NOT Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NOTHROW { #if defined(Q_CC_GNU) -# if QT_HAS_BUILTIN(__builtin_ctzs) || (defined(__LZCNT__) && defined(__BMI__)) +# if QT_HAS_BUILTIN(__builtin_ctzs) return v ? __builtin_ctzs(v) : 16U; # else return v ? __builtin_ctz(v) : 16U; @@ -689,7 +689,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTH Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW { #if defined(Q_CC_GNU) -# if QT_HAS_BUILTIN(__builtin_clzs) || (defined(__LZCNT__) && defined(__BMI__)) +# if QT_HAS_BUILTIN(__builtin_clzs) return v ? __builtin_clzs(v) : 16U; # else return v ? __builtin_clz(v)-16U : 16U; -- 2.30.2